bitkeeper revision 1.1159.1.498 (41c95548t401hgzsaGaOskmS9IeVmA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 11:06:48 +0000 (11:06 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 11:06:48 +0000 (11:06 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge